Add AM_CONDITIONAL for inside gnome-libs

1999-11-30  Havoc Pennington  <hp@pobox.com>

* configure.in: Add AM_CONDITIONAL for inside gnome-libs

* src/Makefile.am: conditionalize GnomeCanvasPixbuf

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 56c7990a496e90122438fa044625b618a7fc826d..9e6c5d1fbde921e76abe08d4652c9600ddb32a7e 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+1999-11-30  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in: Add AM_CONDITIONAL for inside gnome-libs
+
+       * src/Makefile.am: conditionalize GnomeCanvasPixbuf
+       
 1999-11-29  Federico Mena Quintero  <federico@redhat.com>
 
        * src/Makefile.am: Uncomment the GnomeCanvasPixbuf sources.  This

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index af244fa71c4e143d8cf2536c56931e2bd3bf77a1..553d5b67e1a1cfd0a0d06cae194493b5bb61c7e2 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -57,6 +57,14 @@ GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 #
 # The GdkPixBuf library
 #
+if INSIDE_GNOME_LIBS
+CANVAS_SOURCEFILES=
+CANVAS_HEADERFILES=
+else
+CANVAS_SOURCEFILES=    gnome-canvas-pixbuf.c
+CANVAS_HEADERFILES=    gnome-canvas-pixbuf.h
+endif
+
 libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf
 
 libgdk_pixbuf_la_SOURCES =     \
@@ -66,7 +74,7 @@ libgdk_pixbuf_la_SOURCES =    \
        gdk-pixbuf-loader.c     \
        gdk-pixbuf-render.c     \
        gdk-pixbuf-drawable.c   \
-       gnome-canvas-pixbuf.c
+       $(CANVAS_SOURCEFILES)
 
 libgdk_pixbuf_la_LDFLAGS = -version-info 1:0:0
 
@@ -74,7 +82,7 @@ libgdk_pixbufinclude_HEADERS =        \
        gdk-pixbuf.h            \
        gdk-pixbuf-drawable.h   \
        gdk-pixbuf-loader.h     \
-       gnome-canvas-pixbuf.h
+       $(CANVAS_HEADERFILES)
 
 noinst_HEADERS = \
        gdk-pixbuf-io.h